Revert accidental merge of changes from another branch involving materials