Optimized makeCurrent flow.
Revert: Optimized makeCurrent flow.