Revert "Merge commit '0078387b'"

This reverts commit 33e5fbaec11ea3f0db614449e4b3fcc0e64152f5, reversing
changes made to 1149b3d2540d92ada8024510d4ba476f321b4dae.