liquid fun upgrade (reverted from commit 579489762befc97242267fe5c6016f5c1b24d731)