Revert "Various"

This reverts commit 12e93e814dab486df28d1f3a6660774cedbe6dcf.