Is this blocking inclusion?  I can take it out if necessary, or split up this pull if it will help.