Revert "e-2012"

This reverts commit 610fb394a910f74cf585f2c1668ba6a4068afb7e.