Revert ea517af..c29c162

This rolls back to commit ea517af83ca0a140a666b9d778ce47a11dca2f87.