A better fix for the NaN submitCount field that should still prevent double submits from happening.
Authored by: keess 2017-04-24
Parent: [r3014]
Child: [r3016]
