Drop flags #2296

This is just like #2296, but it drops flags in `BuildFile.xml`, pending discussion. Please approve #2296 and then I'll merge this small fix.