Revert "...and remove it for now"

This reverts commit 50ef010948bcf6dad68a5861691a3e2eb08fcf76.
needed to set the site id