Revert "Actually revert release tweaks"

This reverts commit 4d37535b09d0615d7a22338fd693f5e218879b8d.