Rollback to 0.8.26