[Finished #50664117] Also make unicorn happy with the environment :)