Do not disturb/Priority mode until next alarm on Android 6.0

Android 5.1 introduced an option of enabling priority mode until the next alarm. I used that feature on a daily basis. Now, with the redesign of the Do not disturb/Priority mode in Android 6.0, I can't seem to find that option. Further research suggests that this feature has been removed. So first, am I missing something obvious and that option is still there? And second, If this option was indeed removed, is there a more 'advanced' way of getting the priority mode to end after my next alarm?