Re-enable static registries.

@bug W-2342899@

@rev fabbott@
Cleanup after code review to add tests.

@bug W-2342899@

@rev gtorres@
Merging origin/goliver/master-pending-rebuild-serializer into master