Revert "Revert "Revert "E2012"""

This reverts commit c619c70ad3e4b4f320c5749b77c99f476356133d.