Restore some legacy functionality