Rollback (tests removal to speed up the build)