Fix HDP speed-up hack