Revert e5b5494..d2b19ec

This rolls back to commit e5b5494d4324d3bece315e960613bddcbecd379f.