Revert 6c4789f..18564d2

This rolls back to commit 6c4789f69793d0e5ea86478f48a43d6b8810195f.
Revert 18564d2..9cd528d

This rolls back to commit 18564d2cc6d945c8f713a54fe6dd199c5f3c162f.
Revert cd5e63e..74fe93c

This rolls back to commit cd5e63e3de31ac5765bdcd58291eb20fe3cd8947.