Revert "Merge pull request #49398 from Synthetica9/implement-rfc0035" to fix eval

This reverts commit 3fc7d5eb, reversing
changes made to 1fddf2b6.

The idea is good, however, before enforcing, make sure all occurences
are fixed.