Revert "Remove more bloat"

This reverts commit 48e8d4edede08e591e3101a5aae8db1a09bec1a9.