Reverted patch wrongly attributed to me.