Revert "To heaven and beyond"

This reverts commit aa98f52d883f2037ad3c1cbf8cea2fbb6cb81212.