Revert part of r28770, per AlefZet's request.