Revert 2cc16c3..d9242d3

This rolls back to commit 2cc16c363466a0919526666b7d16fd5f1966f117.