Revert "e-2012"

This reverts commit f0416cfaf38354844e1eccab0cf598d31aac5a2a.