Revert "Several Changes from Liquid Smooth."

This reverts commit edabf60f32bc4559382ddeec38402e0f98d62eaf.