Revert 24270, it contained some stuff that shouldn't have been in there.