Only re-add margin if its removed and get rid of magic number.