Revert e7c2306..f170c94

This rolls back to commit e7c230632b61d3ec4780c27fa2de4e46ec56a3ab.