Revert "More sh*t"

This reverts commit 51a102afbd8c8c2d43e6e26ec8e2dde4c86f1dec.