#905 Disable hack by default