Make @jcoyne and @mjgiarlo happy