Revert d7522c6..f7b6ba9

This rolls back to commit d7522c68f9920646d9004921edd239b9ed7612da.