Revert 7ca19d7..afb80f4

This rolls back to commit 7ca19d72d4ea495660bc243f5007087a41b9174e.
Revert "Revert 7ca19d7..afb80f4"

This reverts commit f8bb42747ad8c5b391f71803693567c78e09f5ec.