Revert the change in context layout, I think we can do better