Restored generic values that snuck in on a previous commit