return some appropriate references

partly reverts 3d4216047aa0e63036cd021c9f29d2e2b5bf5c7f

[ci skip]