Revert 342aef8..d3117d9

This rolls back to commit 342aef8caa86d29391d0e2de9a1ed9a19c6bf347.