Revert "revert"

This reverts commit 13c73933ed51e37b48e7036c7f0af1509dd83b2b, reversing
changes made to a48aabd74faa46dab70171f8fe5f7b5e12316bea.