Well this change is stubborn in failing to work ;). Sorry for insufficiently testing this. sr#860113 should address these remaining issues.