Back off code not in use

Revert "try simpler version, not referring to outside profject by @Bundle"
This reverts commit f0c19ef05b8f58199852fa912216d5b5fb5aeede.