Merge changes Ie9ed1067,I0537ffd4

* changes:
  Revert "Introduce ControllerCallbackLink"
  Revert "Introduce SessionCallbackLink"