Revert "e-2012"

This reverts commit 035ac9e3b25171aa307971aedb03760bade01abd.
Revert "Revert "e-2012""

This reverts commit cb365311cbc44cdc9dfa11f7bc74d0a9490d7432.