Reverted a few changes that I didn't end up using.