Revert "Revert "Revert "Revert "Revert "E2012"""""

This reverts commit e730019cd9fff5cda74459c48b2edb2b5122bd6e.