Re-instate the original softserial workaround.

This will be investigated further after the softserial changes are
merged in.