Revert "Rearrange bin/bang imports"

This reverts commit 4da74bf303cb3a11bf4c2e6d73b7ef702f7c5bb4 because it
did not have the desired effect, namely to make the documentation build
when hosted at readthedocs.org.