2.0.1
Revert back #226. Should fix at least #204, #476, #473 and #472