BUILD-441 That didn't work, let's try for just two