(I know Jenkins is planned, but this could alleviate near-term pain in the meantime)