Revert 89e3449..e9d6e42

This rolls back to commit 89e34496b97ea53f76c506e64a11293695330f3b.