If version 7 is coming out soon, I may hold off upgrading from 6.5.2 to 6.5.5 and go with version 7 which obviously should resolve this problem completely, that's assuming that 6.5.2 is ok to import to version 7.