Partially revert previous -- was already working?