Bug 447765: remove Workaround (fixed with Luna-M3)