Fixes gh-24265

Comment From: pivotal-issuemaster

@wesuga 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-issuemaster

@wesuga Thank you for signing the Contributor License Agreement!

Comment From: philwebb

Thanks for the PR, but we need to fix this in a slightly different way. I'll commit something against the original issue.