Stop using the facade internally
Fixed CS
Merge pull request #333 from GrahamCampbell/3.0-internals

[3.0] Stop Using The Facade Internally