Remove workaround.