Rolled back a few changes that need further review