Skip a redundant check

Spotted by Joona

No functional change.
Merge remote-tracking branch 'refs/remotes/MainFish/master' into master-4
Merge remote-tracking branch 'refs/remotes/RyanFish/master' into BetterMaterialStuff_A1-2