Reverting earlier changes - ugh.