r21397: revert accidential commit