Revert "Revert 351b2d2..3ddddf4"

This reverts commit b19eef78571e2469140e27998c6ad2010e72ad69.