No need to do a CAS here, we can just call decrement.
Merge branch 'master' into unstable_staging