Do you want to add this back in?  This is the only thing I'd like resolved before merging.