revert wrong part of r13722 commit