Revert 2 commits to simplify merge.
Revert 2 commits to simplify merge.

0847b1d8e4a234d87ba41504416f60a7a1e0f3c7
"oops, killed a d on the way out"

d600683a5ef379bce56265cc3ba7c33167bbd5d0
"please OCD a little"

conformal/spectrwm,conformal/spectrwm,conformal/spectrwm