Revert "Improved clipping problem"

This reverts commit 2993387c105f7fee057d0cee9353bbf5d5a784a8.