Properly remove workarounds

The last commit accidentally commented out useful code