This reverts commit 5601821d. The prefix + canonical complete behavior is actually obsolete and should not be reintroduced. Reverting.