Remove hack that is no longer necessary with the develop branch

* this yields a small perf gain