This reverts commit 8120b6fb8a and fixes the regression introduced in 8d22b26448.
8120b6fb8a
8d22b26448