Revert to f58a283910ea6ec2e91a0d7363382b23488a0419
Updates types