Revert "Changed Completer behavior as suggested by stalep"

This reverts commit 0c36c43bfbdbbd8ccb265e77451471cca1825c3b.