This reverts commit fddb41744958d21635a60622cfb4067122810bcc. which causes test failures on Mac builders.