Revert "Try alternate method for passing username/pass"

This reverts commit ea4c9fe759f6de31e2d5c0a1c83f30bfe9e94e27.