Rollback addition of guard that causes several tests to fail
1 file changed