Revert "changes from Sanjo"

This reverts commit 7e2e8cbf173d13076fd2407dbb01553a9f1686e3.