Backout changes introduced in 4174657a35 Resolves https://github.com/spring-cloud/spring-cloud-stream/issues/2931
4174657a35