rollback some fp changes waiting for a complete fix