Merge change I8e509908

* changes:
  Remove unnecessary matrix stack manipulations.