Revert "varios"

This reverts commit 90b67cca5199f733a6c2a2fdec649d32a31a5f66, reversing
changes made to 26c5b36aaf1ab8d89346ecf3c6104cdbbdefb7d5.