diff --git a/git-open b/git-open
index b7b55cb..1fcc655 100755
--- a/git-open
+++ b/git-open
@@ -186,8 +186,7 @@ else
 fi
 
 if [[ "$domain" == 'bitbucket.org' ]]; then
-  # Bitbucket, see https://github.com/paulirish/git-open/issues/80 for why ?at is needed.
-  providerBranchRef="/src?at=$remote_ref"
+  providerBranchRef="/src/$remote_ref"
 elif [[ "${#pathargs[@]}" -ge 3 && ${pathargs[${#pathargs[@]} - 3]} == 'scm' ]]; then
   # Bitbucket server always has /scm/ as the third to last segment in the url path, e.g. /scm/ppp/test-repo.git
   # Anything before the 'scm' is part of the server's root context
diff --git a/test/git-open.bats b/test/git-open.bats
index 73ef6bd..3de5e9e 100755
--- a/test/git-open.bats
+++ b/test/git-open.bats
@@ -360,7 +360,7 @@ setup() {
   git commit -m a
   git checkout mytag
   run ../git-open
-  assert_output "https://bitbucket.org/paulirish/crbug-extension/src?at=mytag"
+  assert_output "https://bitbucket.org/paulirish/crbug-extension/src/mytag"
 }
 
 @test "bitbucket: non-origin remote" {
@@ -376,7 +376,7 @@ setup() {
   git checkout -B "devel"
   run ../git-open
   refute_output --partial "//kisom"
-  assert_output "https://bitbucket.org/kisom/consbri/src?at=devel"
+  assert_output "https://bitbucket.org/kisom/consbri/src/devel"
 }
 
 @test "bitbucket: open source view with a slash/branch" {
@@ -385,9 +385,7 @@ setup() {
   git remote set-url origin "https://bitbucket.org/guyzmo/git-repo.git"
   git checkout -B "bugfix/conftest_fix"
   run ../git-open
-  assert_output --partial "https://bitbucket.org/guyzmo/git-repo/src"
-  # BB appears to be fine with both literal or URL-encoded forward slash
-  assert_output --partial "?at=bugfix/conftest_fix"
+  assert_output "https://bitbucket.org/guyzmo/git-repo/src/bugfix/conftest_fix"
 }
 
 @test "bitbucket: ssh:// clone urls" {