backout 272443dba538 (bug 1026290) for maybe breaking robocop
backout bde6ca1bff09 (bug 1026290) for maybe breaking robocop