Minor change on context stacking behavior.
Minor change on context stacking behavior.

Mainly restore the previous to the context refactor behavior.

funcool/cats,mccraigmccraig/cats,alesguzik/cats,tcsavage/cats,yurrriq/cats,OlegTheCat/cats