The quirk added in bug 270229 should be removable within a year or so as things stand today.
<rdar://problem/124194841>