Revert 7e41329..560c27c

This rolls back to commit 7e413293fc88a9c338fb3939213731b1895b4dac.
Revert dfc189f..8097e20

This rolls back to commit dfc189feecea3eb585282ddd0dc07d460ef43995.