Reverting a few changes.