Fixed merge spew from failure before. Doh\!