Revert "revert"

This reverts commit 7d78218ed19b308a60dcd6688695d00789d994b6, reversing
changes made to c570119c618178818a6a2b05e5b34e4337b95aaa.