Revert "Slight tweak to flag generator. Issue #216"

This reverts commit c8b94eeb3f317befa2ae3cc61af72e194432c112.