r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the torture