Revert "Merge branch 'pull-1339' into 3.1.x"

This reverts commit 7bd6a908a82b0502558564d32a7fa604cee3c5a3, reversing
changes made to 480379d1f61d88e732bd10d6773845a788351ed3.

This commit seems to be the cause of acceptance test failures so I'm
backing this out until we get that cleared up.
Merge branch 'revert-1339' into 3.1.x
Merge branch '3.1.x'