revert r177211 due to its potential issues