Revert "Merge pull request #5317 from bhatfield/tidoc-1188-3_2_X"

This reverts commit 6c9ea946dd7d4007c2fe02b04e0ccd91686fc2e9, reversing
changes made to 2604bb2bb9600aa67dec291a7bb02a90684a3170.