26966fa was a semi broken merge, fix that up