Revert d7e074e..ac749bc

This rolls back to commit d7e074e8b5070d1f28d266798f3f4790f2700593.