Re-introduce exception to help migration