Revert "Quick Changes"

This reverts commit 0641752990107094086e97332df46191405e190c.