Remove another temp fix now fixes pushed upstream to opal