Revert r1.17 as it breaks inserting in some cases.