Revert 97acc56..7cef1e7

This rolls back to commit 97acc56eedeb60b3434fe17498b445d44218d775.