Backing out the changes to this file for now

I want to test the changes one at a time.