See https://github.com/spring-cloud/spring-cloud-commons/issues/1453. After completing, changes from https://github.com/spring-cloud/spring-cloud-commons/pull/1454 can be reverted.
