Revert "repool db1055"

This reverts commit 7ada3b1455ccee0773e1eec45f560c497ffd8d64.

Change-Id: I80701fe9252bbb2e95908c221479918e040eee05