Revert "1.8.4 has been released; on to 1.8.5a1"

This reverts commit 1b4e34a16d7b36bb32fe14766db53a6404323ee1.