Revert to previous commit. Fix bug in detail info

Change-Id: I35151e5a5e8e45def36b4251085e79c2503a099e