Revert "Update for rust nightly"

This reverts commit 78e706e56728669c7d5427897e65be54200ae639.