Revert not instantiable class to not abstract with internal constructor (#876)