Revert 4063c76..095c8d2

This rolls back to commit 4063c76b77b503ca74fa5acfb1771ecf320042be.