Revert "Update some strings, and merge jb43 into hlv"

This reverts commit 878e0b7c4bc375bb30ca85090a0e7d1a6c8cffb8.