Fix incomplete merge in 899df1e