cked out changesets 10bdfbe0195b and 06b0f332039d (bug 858687) because of Robocop failures (r=backout)