Back out of hw-main _callback -> _descriptor changes