Revert "Started porting to FML 1.6.4"

This reverts commit fed186e9a1a794a048b40617fe600bb00973261f.