Also prevent them from being reintroduced.

Change-Id: I4e16293c8185462b48e641f066d78449685e2854