Merge PR #22920 into jewel
authorSage Weil <sage@redhat.com>
Mon, 9 Jul 2018 14:50:16 +0000 (09:50 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Jul 2018 14:50:16 +0000 (09:50 -0500)
* refs/pull/22920/head:
Revert "Merge pull request #17893 from dzafman/wip-19140-19224"

Reviewed-by: David Zafman <dzafman@redhat.com>

Trivial merge