Revert "From Kayant, disable scissor optimization"

This reverts commit 538f85fc1ffe0c67c78556fc1b10047a72a68383.