Temporary build fix for bundling issues.

May need referencing in files to enforce loading order.