Revert d79565d..c21a407

This rolls back to commit d79565dd83d888b2bd5e490de8ba7971828117d1.
prep for nether trip