Are these changes intentional?  This branch isn't about exporting.