Revert a09c314: The constructors are executed in EDT; no multi-threading issues with 'this' escapes
Revert 7273e5f: The constructors are executed in EDT; no multi-threading issues with 'this' escapes