Revert "Fix #4"

This reverts commit 558b92f5c2ecbb857094a3926a100e51211a08c2.
Revert "Apply more of #4"

This reverts commit 00e00afce093b47608ab5ca439a97a280b81f928.
Revert "Apply more of #4"

This reverts commit dc713a3e6f884b62e660f816764c14f004e9ffa4.
Revert "Apply #4 partially"

This reverts commit 7273bec5102807a7bfc200fd17efb4e59d24eb1e.