Remove no-longer-needed workaround.