It looks like this actually regressed in e22794867d878d53675fcc91d2ef1ad2494a2ff2 and was an intentional change. 

Paul, could you please take a look at my patch and see if it doesn’t regress your intended change? Maybe there’s another cond necessary.

Thanks,