Revert "Bring up to date"

This reverts commit 862fbe26491133f5f6eeec03493191631197d4d9.
Revert "Fix Derp"

This reverts commit d6151a084629a2ab106f3b6dab2717abd91374a6.