This reverts commit 219f32f4. Commit contains unsigned compasions that break bots that build with -Wsign-compare.