Rewrite of EH for MoP Release.