Revert unrelated (and unworking) change from r61940)