We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.
(cherry picked from commit b74b0f4e1c)
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.
(cherry picked from commit b74b0f4e1c)