Remove workarounds for BL-316

Don't seem to be needed any more.
Presume L10NSharp has been fixed at some point.