revert make use of new file

Change-Id: Ie6c791e61990ea69a8ae9b6a84314a3a9c577e98