Reverted previous margin PR changes