Remove the unnecessary workaround.