Remove guard, fix tests instead.