Move back to neo/neo_workstation