Fixed abusive merge from c174143dc2