Revert e342f0c..e4932ff

This rolls back to commit e342f0c105ed720034dc36f431e105167e7917d4.