This reverts https://github.com/JuliaLang/julia/pull/5031