Ok, so I have to revert this change and send another bugfix PR to 2.0?