which had been hidden by now because of an semi-optimized code path which got
removed in the latest hyphen version

Change-Id: Ica4b0cfa16b19469fea1f630bda09eaff82e8857