Revert "Merge pull request #1168 from RyanCopley/stable5"

This reverts commit 5c8161bd2edaeb144267d816b3b2d7170f0e5fe4, reversing
changes made to a3e9b1c8fad8a238d1e342f08a7cf7743ffb59c1.