Tim wants me to commit this. I removed Google stuff.