This partially reverts commit 3e0aa4af2da4e4010cd9011aaa125fed7ca220e6. See the discussion in the PR.