Revert a536fb9..0245fb3

This rolls back to commit a536fb9ec7da71fb2e9ca23815db74bd0fde7d0a.