Replace one work around with another