Revert "Facelift"

This reverts commit e8a1ec4075fa6432d605d8bf8b038be707100822.