Previously this was conflated with another Oracle-specific behavior. Backport of a03d38dd from master.