revert r27341, it introduce wrong behaviour for other models