Reverted flag count changes

Had to revert them to be able to build