Simplify code introduced in 7f7ea810.