This reverts commit adfb7f62. Due to JavaDoc error Change-Id: I41acaa83b7800f88f000291c8deba18d7394be94