playdoh-upgrade: Working through browserid issues