convert switch to flag so we can whitelist (bug 879453)