error was introduced 33269, to fix [#24834]. this only reverts a small part of that commit, added note not to change this.