The object identity retrieval strategy workaround was only needed for Sf 2.0, it should be safe to remove it now...