Revert "Revert d4a47fd..dd89daf"

This reverts commit c7d32c1666702b0928a3c54174b28509ce018473.