Revert "Merge remote-tracking branch 'origin' into unicenta3.70"

This reverts commit a471cfc546144a4877a0018f4cf8462658975097, reversing
changes made to c59614c10c55ed309f3ea44d927a09f70014e146.