revert core part of r111231