Revert 680a08b..3e88844

This rolls back to commit 680a08bfb5b4f5d6b7d9648a37e223a98c182c76.