Roll-back fix for bug#9481.