Revert ordering. Actually transient should be at the end since they are not present in the stream.
Remove all the module id stuff.