Use existing steps instead of execute_script

Change-Id: Ifb54a9162ac8b4b9c68aea1508081999ea7e7f6c