73036658/deposit anchor bug

Fixes Pivotal stories 73036658, 74837718 and 74932660 which are all basically saying the same thing.