Revert "Merge master, Kuwahara optimizations"

This reverts commit 9655f16e89caf35878ac7d2f3e2646568a5a670a.