Revert b351b4a..e006ff6

This rolls back to commit b351b4a1180a406f10f48bc32cb827b3e485265c.