@seniorflexdeveloper: Is this part of your change no longer necessary? Seems to me we would still want it.