Revert "Revert "E2012""

This reverts commit 11b5c2b4215f35579da15931e3cfa883d39c3962.