Revert "HACK: tegrasim/venice2 temp hacks"

This reverts commit 887aab1a2509dfbad79b13cece103b688dfad953.