Toggle Bundle fields based on === bundle.  Not based on silliness.
Merge pull request #1864 from JustinSainton/patch-4

Toggle Bundle fields based on === bundle.  Not based on silliness.