Revert change to test skip condition

This was part of a commit cherry picked from another branch, and this
change didn't make sense on this branch.