Merge "Revert "Replace remaining enforceXXX methods""