Revert a572d91..cccc133

This rolls back to commit a572d91bcb3d730a92dca496d70489d810bcfa63.
Revert 0d0499d..d3ef066

This rolls back to commit 0d0499d8076611e0d88308b51216902a8b1a1c11.
Revert cccc133..bd5ff1b

This rolls back to commit cccc1336adbcdc170549ccfa3200fb325effa6ed.