Revert "E/R"

This reverts commit 548cf34f278de68d524c9b3aa4d14bee357e0597.