This was a dumb idea on my part, and should be undone. It's caused a goodly amount of grief for literally no benefit except one less `if` in the client