restore some performance lost in
c7ac37cf1bc3c25514742eba3f1910e995619f2f