Revert "Revert "E2012""

This reverts commit b2ab742ac43bb6fd96332830ac918311f535fde1.