Revert "Revert to stock values"

This reverts commit 3dd1b8f4d2105e4daa9d3115ac3624e393b4dac7.