back out Collections.unmodifiable until we have more test to catch the issues they surfaced / created