Revert 1cedb4c..68754ec

This rolls back to commit 1cedb4ccd266b18dcc8c734555deb5f21315426b.