Revert "merge with new_branch"

This reverts commit 36d687c78dd4529ba4acf04e6af9607e92b34eec, reversing
changes made to 8c7f1be0f1de143281ae546781dedf2f2593407d.