Revert "Teleportation fixes"

This reverts commit 7b651df1e421b984649d9ad5d9d1e09865ae5246.