Issue #2175949 by AndyF: Drupal_static() used without reference.
Revert "Issue #2175949 by AndyF: Drupal_static() used without reference."

This reverts commit b3ae7008830a4f3991ad063c44a179e1bd06a1b2.
Issue #2193483 by NofarG: EnsureBaseTable() Does not get the correct table name.