re-enabled the disable change in the previous commit with workaround.
re-enabled the disable change in the previous commit with workaround.

MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame