Revert SHA 6a5b2f247a58

This commit caused problems when the scroll view is improperly configured with Auto Layout, resulting in a zero contentSize. If the scroll view is correctly configured with Auto Layout, the contentSize will be nonzero, bypassing this assignment anyway.