This was a preparatory commit for 3292429ab312 (which introduced a bug, see
issue #3728) and modified the tests for issue #3620.
Commit 155a895604ae per se did not introduce any bugs, but was difficult to
inspect because of its size. For this, the corresponding PR (#3622) should not
have been accepted.
--HG--
branch : revert-3622