Revert changes and repub with @orrsiloni patch for dynamic includes.