It's funny when implementing a new feature immediately involves doing a NV-specific workaround. Sigh.