Revert 26f4f1e..c643381

This rolls back to commit 26f4f1ea5b766154a280ddf7fa9bf8ef31a7db9d.
Revert "Revert 26f4f1e..c643381"

This reverts commit 67d3bc58c3b9d05dace8e5ff2883cd05af812227.
Revert 26f4f1e..eb845fa

This rolls back to commit 26f4f1ea5b766154a280ddf7fa9bf8ef31a7db9d.