Issue #2341461 by ashutoshsngh, esod, quietone: Remove usage of form_options_flatten()