Revert "context collapse"

This reverts commit 4d00eb5664aa38899f2f29b7d46409b23170fce9.
Revert "context collapse"

This reverts commit fcf7077f550755cbc01f2de1a43e9703766b3a57.