Revert "Switch branches for 8960 common"

This reverts commit 112b9bc18671dcc773d58abf7b451b93745da660.