Temporary revert of Draw constant changes