Simplify code introduced in 959f7e4