Revert 9669386..a647b38

This rolls back to commit 96693861d799220cf41a77d6b3ceedb08d12b29c.
Revert 070d201..32e77cb

This rolls back to commit 070d201e49cd87416f0ec77ff9488d1831edfc02.