This mostly reverts 4ef5db1bc4 for #1966, but fixes #3684 by allowing numbers to be bound again. If the user wants to bind numbers instead of using them for a count, why not let them.
4ef5db1bc4