Revert 79e54a7..eb058b6

This rolls back to commit 79e54a74a8acdcaa56ca145215c5b92e1b20abc6.
Revert "Revert 79e54a7..eb058b6"

This reverts commit 9b2a105dc29430f662f382cf4683c3c9003cb259.