b4b67177b53c23c6fb77aea7f0bc5c559f8bebe5 introduced a regression of its own: the prompt would end with $ for all users, not with # for root as it should.