revert r26953 + r26954