Restores and fixes 7ce48b0d

This reverts commit 99ef5536.
This reverts commit df5bb189.
This reverts commit 9abec5a2.