Rollback again to 0.18.16