TW-1471 is fixed, removed workaround