revert r110340 after talking with krinle