Revert c7d46dd..6b3874a

This rolls back to commit c7d46dd9191b7c85e21839f19176abad1ac58d5b.