Revert "Couple of uncommitted changes"

This reverts commit 2a5c31043ec640e2cf27f629549ad30951e68e1c.