Revert e9e4c7c..fa15c78

This rolls back to commit e9e4c7c8b23a68f3f3797808f884289ee7544a21.