Revert "Squashed FML changes."

This reverts commit 852f64847542d52f4758204857ea712e82e0a0b4.