Reverted #2478 since it will break correctness of texts in existing applications.