remove temporary workaround