try to regain some of the performance lost by the fix introduced in !2926 (merged)
/cc @apearce @frankm @sponce