Revert "Merge pull request #13 from thehyve/autocompletion-fix"

This reverts commit c11cab6bf50095d57da202122f7a0bab1e0aecc2, reversing
changes made to d5119b1d5018d6c030987dd8f619fcadca9741c9.