Revert "Revert 48748dc..c673546"

This reverts commit e975f0ac3806a1028b3d5fa0fed84665669253f1.