Revert to 0.20