Fix recent merge related broken-ness