Reverting changes from alert branch.