6a94538b6d
Also fix a regression from cecbd256 where the dummy control data wouldn't be used
Also fix a regression from cecbd256 where the dummy control data wouldn't be used