Removing woraround which was introduced for #381.