This workaround was only relevant with our previous, hackish, experimental bridge mode implementation.