#4285: Backwards compatibility