This reverts commit 0917ce4e22, as it breaks building osmo-sgsn. This needs to be reworked to be backwards compatible. Related: OS#6373 Change-Id: I2c2b2ff0875217e041d94c8e2cef030d2a86c2d8
0917ce4e22