Fix undefined variable accesses
Fix undefined variable accesses

fix a merge error in the last commit

matrix-org/matrix-js-sdk,krombel/matrix-js-sdk,williamboman/matrix-js-sdk,krombel/matrix-js-sdk,krombel/matrix-js-sdk,matrix-org/matrix-js-sdk,williamboman/matrix-js-sdk,matrix-org/matrix-js-sdk,williamboman/matrix-js-sdk,matrix-org/matrix-js-sdk