New razor_margin, take 2.
bench: 8219662