Revert 8700f43..f9c9895

This rolls back to commit 8700f4376b2d3f6ca0e7607c79f118953aaeb0d0.