We should be able to do this now that we have the gmock change in to change the default.

@alyssawilk just opening tracking issue so we don't forget.