Revert "Merge branch 'fix_644'"

This reverts commit 1301017f44297678ff282caf986f0c12448511b7, reversing
changes made to 2a009ca32cba44f8a2ec59159036881c867c7513.