This commit reverts the intermediate layer that was created to accommodate with the AOT use case. See gh-31682