Revert "Stupid hack to reduce errors"

This reverts commit 6a32ed4c348743822defc58111b648f2950a658e.