Reapply 41396b1c7933535fa8e6b0cf9190298ed557f1b3.