Bug 575763: [WaLTable] Refactor (part 1)
  - Revert inadvertent change

Follow-up-of: 175c44a13dd05b691f444dfc3e748159f2b6c5ad
Change-Id: Icfa2b458dd7d9d0d2ae7f12e1890060770de2368
15 files changed