CDAP-739 undo removal of static booleans, will see if we can
improve that in a separate issue.