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