Revert Flag testing upon abartlet's request ;-)