This reverts commit d3e3f36ff1, which reverter the original commit 2c16100e6f, but with polly tests now actually passing.
d3e3f36ff1
2c16100e6f