Revert "Using the latest and greatest"

This reverts commit 816f9d02e6058d807f04a2b560f95ee5b17deefc.