Some code consistency
Revert vemacs for the 3rd time.

@vemacs, do not change this, or I will not only revoke your access to the repo, I will also skin you alive. Using "API" methods in this context is just fine and just because it doesn't suit your fancy doesn't mean you can just change it. I am the BDFL, obey me.
Just to be sure, initialize the API first thing.
Add omitted returnBrokenResource
Merge remote-tracking branch 'origin/master'