Removing idempotence workaround.