Comment 2 for bug 1667497

Looks like a simple way to fix it, and it works for me. I tried a few holds and the message didn't show up, hold boundaries still worked when I tried it.

Pushed to master, rel_3_1, and rel_3_2.

Thanks, Josh!