This should return the script to a functioning state to facilitate development and testing. Change-Id: Ic01ce99f30c40f825faebcf08f2f33ccb071bc28