This commit manually reverts the commits:
- 97c69dc4
- 3278aa49

The basic simulator was not functional anymore because
the UE did not send RRCConnectionSetupComplete due to
some problem in the PDCP layer, most probably.