Revert "Removed bloat"

This reverts commit 249f0bc64f0458d87ea773580927212f89e480d1.