Revert "Revert "Revert to stock values""

This reverts commit 5baa58a5d7479c597e74d82669bc309e1a877fd4.