Revert c72f49d..096e7bc

This rolls back to commit c72f49d68cbf2b92c0203ff32b23984e05e746fa.