Backports for branch 4.4


The first two commits are effectively reverting some recent changes, the third is Hardy's very popular HSEARCH-1447