Revert "Revert "Revert "e-2012"""

This reverts commit 41a1aa624372580cafac3332e3f4a3a5cd687557.