Revert "Merge remote-tracking branch 'root-cxxtext/master'"

This reverts commit dda568c4956c8d4a666be8dba96cb0ea2f1cff84, reversing
changes made to 87ab33c3399bdc1be28949c56585a5b3add38a87.