Revert "Smoothness tweak"

This reverts commit 4e279d18e21abd6ee7e47c5832e87985295a7f93.
Revert "Revert "Smoothness tweak""

This reverts commit f56553543385765db9540161922a042af992be4f.