Revert e26ddb6..34fe6be

This rolls back to commit e26ddb69294efea7ee1bdcf27142d5a031653190.
Revert "Revert e26ddb6..34fe6be"

This reverts commit 97584a9d7d3986599c17bca6c2315e272987cce5.