Revert "Merge branch 'ver5.1'"

This reverts commit 85f5c172fa83963676015092538f5357b65c796b, reversing
changes made to 372b61e683949aa4afb1bf660a575cf8551c2850.