Revert 7b5d36d..a0a96bf

This rolls back to commit 7b5d36d0e59d2e9a36af28e18c2db55bfb48fb41.