backout 578bf8d6363c for causing robocop pan regression