Trying to get session code merging to work again.