@jdob and I also discussed this yesterday, and I believe this will actually work correctly. I don't particularly like this code however, and I've written a separate e-mail about a way we can refactor this and the other client extensions in the future to avoid these confusions.