Revert "Revert ade87b9..78420aa"

This reverts commit 3ca7f80e6c08a3a3622fd48a534871b021108cfc.