The inner import was dropped during the reorganizing of the database backends in commit 28308078. Backport of 95058606 from master