The breaking changes were a tiny subset of the whole commit so I just reverted them.