Revert "Small changes" - Keep these around

This reverts commit 78d4e7fb07061851c21a84039b53e0fd1cd99808.