rollback on infuse from 4.04 to official 2.3.6