Revert "Commit Context Manager + GPS Bundle"

This reverts commit 830c01f026d28953d3d6fee33e7644716805e27a.
Revert "Revert "Commit Context Manager + GPS Bundle""

This reverts commit 9d469d1e2bbee046ffa93a4b3ca401b16aca3c99.
Revert "Revert "Revert "Commit Context Manager + GPS Bundle"""

This reverts commit d5e714241648d98c6de4cf5e3b7940096752ad2e.