Backing out most of the changes for debugging