am 04a6a9b5: (-s ours) am d46525af: Revert "Use the special CONSTRAINED font bucket for flo."

* commit '04a6a9b558bffd44d9d94005952940c680f304f9':