Looks like Bug# 854783 is submitted for this. If you want a PTF you'll
probably need an SR but for now the solution seems to be what was
mentioned before in making small changes to the script.
If you find this post helpful and are logged into the web interface,
show your appreciation and click on the star below...