Revert b969c68..5db1d6c

This rolls back to commit b969c688be349ad53621fb914bfb42f10f563ad6.
Revert deb319a..44e95ba

This rolls back to commit deb319ab11f80fd26e8050c7fe16eee7bdb60ba2.
backtrack