Revert "Revert c84816c..9ac80ca"

This reverts commit bb13ce8bab2614d361d70bcf26b7db6615ce20f7.
Revert "Revert "Revert c84816c..9ac80ca""

This reverts commit 0c944f35d4f4dea4ad2c0ad60ab73b16b627b4ab.
Revert df474ac..67c0889

This rolls back to commit df474ac945898d08372236b33d42d6d32a229da7.