Revert "RIP"

This reverts commit a4cce6e777c78e618bbd444ced1fde62c8b39de4.
Tweaks