Revert 7487b62..95f9be5

This rolls back to commit 7487b62ec9417d8d70f93c4376c805ff0cb47528.