Turns out that last change broke things. Partially undoing the change.