CORE-352 - Reverted the fixes to the original code. Fixing the cancel on deletion broke the cancel on creation.