Remove workaround for TC-1624