Revert "Revert 4b74f8a..20652c4"

This reverts commit de39bc4d23741d05e5d6eeb38e9fffb0d497ca57.