Revert a996c1f..8406716

This rolls back to commit a996c1fd68b9a4a832fb703bb4ba57160326ed9e.