Reverting the previous push after discovering some resulting issues I'll need to spend some additional time looking at before pushing a fix to the problem the last commit was intended to solve.