Fix build after #3836
Merge pull request #2841 from popcornmix/fix_tidyups

Fix build after #3836