revert margin hack implemented in 466f7ab607e6bf576cc4fb611e2926372bb06bea