Revert "Revert 1992dc0..520ce98"

This reverts commit 52767d4018595c3cf8fca47d9e64e511de92ae15.