Revert d107c88..3d23dfd

This rolls back to commit d107c8866dbbd165b479cd73b396dc1e08bb3f72.
Revert "Revert d107c88..3d23dfd"

This reverts commit eb7e197bfce8ee2a6d3d8a760436185a80bdb00f.