Hmmm... this seems suspicious. I may have merged incorrectly.