Revert 92d2715..df952e8

This rolls back to commit 92d2715e124aadf854e8a6992fe9c6b7f42f1181.