bring code to old state, make consistent with docs, Closes PR 13642 again