Revert 312772c..637c357

This rolls back to commit 312772c6adf5099ff221daf71b2d60a588cae7b5.
Revert 548c513..dd457b1

This rolls back to commit 548c5133bb2654967d07debe4e2aa4c8628e8511.