Revert "Move draw by material check"