Revert unused flag addition