Revert "Apply suggestions from code review"
Revert "Apply suggestions from code review"

This reverts commit acde9a01a3f5cd12b769385880bab90281ab8361.
A better solution is a65208ca8e593e2478b0848e6b5cbda7530a1707.

NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs