rolled back so that -e works, -p still in limbo