Revert 07e0148..786c51c

This rolls back to commit 07e0148c49e73c1166de20fd80db76b9bd032bc9.