Merge "Restore NoClassDefFoundError ctor removed by mistake"