Revert changes from r2134 that snuck into the commit. Mea culpa.