Backed out changeset 98feaf977ea2 (bug 905371) for robocop failures. a=backout
DONTBUILD