Revert f9927ee..fafcebf

This rolls back to commit f9927eebec15f2edbf2a1360f29aaea095447f0c.