Revert previous patch (4162594)
Seems to be good in 1+0.01, neutral in 2+0.02 and slightly regressive in 4+0.04.
There is a risk of bad scaling here. Typical with king safety.