Revert "Merge pull request #1 from Meshu/dev-jt-Q"

This reverts commit 72014f38a7a46cbfe03db514c38b01313d9f1e81, reversing
changes made to 6c0dc6da8fd2190dff1ec8dd4a7283f79a57a70f.