Revert e4342ab..deed5ad

This rolls back to commit e4342abe2845a1fef305fc5a82d9ed402a63263f.