Revert e9c5f7d..f7347bf

This rolls back to commit e9c5f7d23d691762934795c96caabc5090e11389.