Looks like a bad merge on my part, will fix.