revert core edit by issue #1 #7