Revert "Merge changes from patricktokeeffe-issue78"

This reverts commit 484873e09966f624e41b2187727600ef1971e548.