Material: Remove unnecessary conditional branch. From @cjshannon.
Sorry, I couldn't merge cleanly nor cherry-pick.