Revert "e-2012"

This reverts commit 5b7e47df99869c775c8f0ebaa4f2f5896de6f474.