revert r111225 and r111201