Pull back part of rev1.7