• Revert "Auto merge of #49 - DDEFISHER:master, r=metajack"

    This reverts commit 3a78976, reversing
    changes made to 7a51247.
    
    This is done because it broke the build and wasn't caught by CI.
    emilio committed May 7, 2016