Fix FMP support for the 1.7 branch once and for all!