database code uncommented

Change-Id: I5804641a9e444c27731deed822d5b2d434a3f9e3