Apply again [916352f282855e3e4e86a39df9452fead2aa0771] that got lost in the merges.