Revert "Fixes"

This reverts commit 8143869b981026a98efcd46da3600964709f5158.
Revert "Rewrite the links"

This reverts commit 5e678b15d946f28b81f194aa80c7d7a8d8d49ca0.