Revert 69dbde7..8568821

This rolls back to commit 69dbde746f438c59349e724f9b5a30cc36a87d6a.
Revert "Revert 69dbde7..8568821"

This reverts commit 78215b53d406d2cd8985cc0734b9a34754839bab.
Revert 69dbde7..2284df2

This rolls back to commit 69dbde746f438c59349e724f9b5a30cc36a87d6a.