remove fallback event context un-aware methods
remove fallback event context un-aware methods, do retrieval once in the only client left rather than effectively twice
remove fallback event context un-aware methods, do retrieval once in the only client left rather than effectively twice