Revert "fixes for https://github.com/JuliaLang/julia/issues/7314"

This reverts commit 66521012732ea2cb840d71b562a937ecb9a31d3f.