Remove the temporary hack, now that the llvm-i686-linux buildbot has