Revert 9a04a13..7dae5db

This rolls back to commit 9a04a135bb49f3e6a68a9a45c9a8b01ac6717f2b.
Revert 2b6deca..19704a5

This rolls back to commit 2b6decafdbae8113f9ae7a6e60d0794df844bd76.