Fixes #27978

Comment From: pivotal-cla

@rilmay Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

Comment From: pivotal-cla

@rilmay Thank you for signing the Contributor License Agreement!

Comment From: sbrannen

@jhoeller, I've assigned this to you since you assigned #27978 to yourself recently.