restoring 0.4.x-compatible as default