This reverts commit e3dcf0ce1f, reversing changes made to c71e9fdf2d. Once again we had a broken new plugin that Travis CI and local building didn't catch.
e3dcf0ce1f
c71e9fdf2d