Revert functional change from r56594. That broke more than it tried to fix somehow.