Revert 16f83f0..b6b436e

This rolls back to commit 16f83f048921f8fcff11180a7417b69f736be50f.
Revert b6b436e..f277c68

This rolls back to commit b6b436e7f422deb258f1e9f874d3a5fe8e52d47a.