Revert 85f7785..74e6e44

This rolls back to commit 85f7785d9cd9df98e052e39378a2e6142284e938.