Since we weaved the latter into the former, we can now get rid of
the transition code.  The behaviour doesn't change.

(cherry picked from commit 927f4e0e)
(cherry picked from commit 0b119652)