Avoid unnecessary enforce
Merge pull request #2790 from sinkuu/remove

Avoid unnecessary enforce