First attempted fix for client to client GUI bean bounces (ported from
master: DO NOT MERGE)