Revert "Merge remote-tracking branch 'origin/change_for_pull_request'"

This reverts commit 642d28fb1eade3f0b05899f49a7c2648355614a8, reversing
changes made to 4254a3384b23a58041739f90ae54ffa0545bf646.