Revert "temp hacks to get it working on SII"

This reverts commit 456ce032cb56bde8e929bee68791ff4d03d671e8.