Revert "Remove pointless db steps."

This reverts commit aab06fa9c997121eb504f83a04c8f6d518883527.