Revert "E2012"

This reverts commit 08274e61e2c9838ef9c186c0e626dce03cc9bcdc.