Christoph has a fix on the road of upstream, but it not get merge yet, so let rollback for now, and upgrade when upstream done. Workaround for #1201
