Removed unnecessary workaround.