MA-157 Move context back into properties.

https://openedx.atlassian.net/browse/MA-157