Revert "Various"

This reverts commit 626bf73430d5904255f7fd6b6dd471d39195d7cd.