Use member variable to control initialisation, not static variable. Backport of 32f4856a (master). BUG:297039