Revert "regression fix for 52872a0d: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error)."

This reverts commit 34275825.

 Other than stated in the original commit msg, both regressions are
 related to inproper rebasing of two pull requests touch the same code
 portion.