Merge "Remove defunct flag"