This reverts commit537fdbbfa2. Somehow the revert in9b708c8650was undone by the next merge from the 3.6 branch,9876ff183f.
This reverts commit537fdbbfa2. Somehow the revert in9b708c8650was undone by the next merge from the 3.6 branch,9876ff183f.