Restore backwards compatibility