Cleaned this up while I was debugging another issue. Change-Id: I0663b9ed581c6868b59655a0f994d870971ec1a6