Revert 12861cf..e8235b2

This rolls back to commit 12861cfdc015ac2ba64f8b7cf48311430e85ba63.
Revert a57cba1..160f677

This rolls back to commit a57cba12398aeb67579c2a3c8387234411f610d7.