Revert "Attempting autocompletion fix"

This reverts commit a07bc1506a0c05c468fe9672b7c0a86fb47ceb84.