...without breaking 1.9.x