Revert a750bef..b0819c5

This rolls back to commit a750befb17b9f09b5bb389eba12d140af6deb5c6.
Revert b0819c5..be78ebc

This rolls back to commit b0819c56221c2b5568598f89eaa7a7dea017cde6.