Revert "commit 2 by sojujazz"

This reverts commit cb32cf430e5d5dc209992e52d6512b56172262d4.