Partial revert of r85022. Removing added auto-margin that changed behaviour.