I picked up this PR after some of the work had already been started so some change that may have seemed intentional might not be.  I didn't know if @bkearney meant to make this change so I left it as is now.  If you can verify that removing these lines was incorrect, I'll put it back.