Revert 96bd09c..87a696f

This rolls back to commit 96bd09c4a767ec889b22937dcc205e9861d9235d.