This reverts commit b1039f0f1b.
(This is a temporary revert while some of our customers deal with the breaking changes involved.)
This reverts commit b1039f0f1b.
(This is a temporary revert while some of our customers deal with the breaking changes involved.)