Backed out changeset a3fe19cdb618 (bug 938019) for robocop failures.
CLOSED TREE