Remove workaround put in place by a previous patch, due to buggy flag reporting.
Tests to verify fixed behavior.