Revert "Merge Away and NotAway, Add Back"

This reverts commit ce3dbf2de888b5f2878a7de0fb2569ebb33464b9.