Revert "missed a few 2.3.1's"

This reverts commit d9b502dfb876c40b0735008bac18049c7ee7b6d2.