backout 520df0a03a00 (bug 1004668) for breaking Android robocop