Revert 4ac787c..c1c32af

This rolls back to commit 4ac787ccceb2911b4d00c03cf049ab1b21f495fd.