Revert r181009.