This reverts commit 8099d33b65 as it caused a regression that cannot be solved without changing force_text() which has a small risk of introducing regressions. This change will remain in master along with an update to force_text().
8099d33b65
Tim Graham