Revert "More Customization"

This reverts commit 03d11fb090439690bf4417ace00bf76acdf8618d.