Adapt to FeOS e9006fb breaking changes