Revert workaround for the now-fixed inference bug, SI-7688

Partially reverts e6437fdcc707