Revert "Revert edc27b9..deb488f"

This reverts commit 1c5e17f09d210d36ae978b2c69de2ed92922c116.