Revert "V6.1.5.1"

This reverts commit 74e6eb6252f84ea7da22bda186129724a8650a39.