Revert "Merge branch 'AndrewBerry-master'"
it broke the travis build

This reverts commit 4ba649b5df54a76722cdda512e8f1aaedacee95d, reversing
changes made to e95bfa4dd8dbda5a56e82561978bddbaca542af5.