This reverts commit 113f49bb21 after the schema change has been completed. Change-Id: I5412466444526986e1209d0982dd62cd5b387ad1
113f49bb21