Drop-in backward-compatible replacement