This reverts commit 283f38a2c3. Change I5d0aeac51b83bf14150fa3036f71965cf2051243 offers more flexibility to the plugin author by passing in more data. Change-Id: I71bd403375c0ca53e4d8c2f54ff46f431fd6725d
283f38a2c3