Someone who knows more about what's happening here should review this MR. But this solves the immediate problem while maintaining some of the functionality.
Closes #3204146