backed out 0397223ab4a050f4acffeee6952660710327f2a0

Related to #5970