Revert a56f988..74979fc

This rolls back to commit a56f988ac70b6cac76eec7a636be1796f0a049a4.