hammerhead: lets go back to enforcing

Change-Id: I26f02e07a3d809f1b3fbea0cd0d23c08792bd4c7