This reverts commit 113f49bb21 after the schema change has been completed. Change-Id: I5412466444526986e1209d0982dd62cd5b387ad1
113f49bb21
Having them separate improves readability of the code and makes it easier to work with this code. Change-Id: Ic6aaf1ace3640f66ad41c2d85b4f7d740b259e0c