Remove some fallbacks that I forgot to remove earlier.