Revert part of r45817 to try to fix build