Rework to make this work more reliably in a range of environments.
Rework to make this work more reliably in a range of environments.

lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch,lkraav/davical-rss-feature-branch