Revert "Merge pull request #138 from pentaho-tband/dev"

This reverts commit bd100003cd6d8a704868a9ad72fa4c4862297ff4, reversing
changes made to f156fdfea403e5d679a5ae63bd160b4f13f77e23.