META-329: Different take on this