Removing the context manager!
Resolving merge conflicts
NOPE. Don't do this and have annotations!
Create the proper component.
Oops, remove the import also
This was needed to make it compile. Shipping!
Merge pull request #1007 from rackerlabs/REP-654

Rep 654