Silencing the warning from r189605 in a more conformant manner.