Revert 6c174f0..f68f325

This rolls back to commit 6c174f070e3023a890a69977e104867fa51cdebf.