Revert "Revert to 402fb688"

This reverts commit df5d9ed72498a4469bd69b569ac3465ec487ec4d.