Merge pull request #1 from rgg410/feature/testrevert

Feature/testrevert
Revert "Merge pull request #1 from rgg410/feature/testrevert"

This reverts commit 95a60e7eb4c4afa198a8ee35f314b8808bc76ee1, reversing
changes made to af28ef7cfab352556da92b422fee5de394057b35.
conflicts resolved