As Borland 5.6 and older are no longer supported,
I searched and purged workarounds for it.

Change-Id: Iaf22c7d0c9b573e57e270e4dbcbd8b4a0f16a780