Workaround unfortunate bug in 5.3.0 [ISPN-3405]