Since nobody seems to know why these are separate, merge fop into fps.
In case this untested change doesn't work out it should be reverted :)