Revert e0a6a9b..79eb1a2

This rolls back to commit e0a6a9b794db3cfbdcc4802fee7af414d1eac9e4.
Revert 79eb1a2..0912a7f

This rolls back to commit 79eb1a2e5e677aeb3cae8f7757cf7df33d0fcd3f.