Remove workaround to changes not resolving on cancel