Revert c977ca6..96ad508

This rolls back to commit c977ca656173a79711e3c6ccbccf80f654db9b28.
Revert 96ad508..b7ee9cd

This rolls back to commit 96ad508c6d106e5dc245101cb1acf38a64f246ba.