Revert my hack as the build seems to be fixed