Revert c560e88..96078bc

This rolls back to commit c560e88535952fc93ef3a4cd4fc51b6f4308a5e5.