[Fixed] a couple more file reversions

Change-Id: I1a244d3dd3eec8efa3048c03a9d72a9faebc4b59