Revert "Change to a branch name that's friendlier w/ my scripts"

This reverts commit dced202081e6b642353297eab6f06dd91ce5c790.

Change-Id: Ib14c6f823f35d5649914b48c7ecbf3bd96b08183
Revert "Use our hammerhead for now"

This reverts commit 1e9d0298891c1b7242a2720e057dd454e7f20abf.

Change-Id: I72782850bde6c8d87dadb79cefdcf08a0c8dfcd6
Merge "Revert "Use our hammerhead for now"" into kk44