Undo merge that WASN'T ready to be done YET!
Merge pull request #287 from wajam/manu-undo-stupid-merge

Undo merge that WASN'T ready to be done YET!