This reverts commit c2707d426a. The changes for 1.7.3 were reverted as a temporary step due to a major bug in Portal link handling. This commit brings back the changes followed by a patch for new release
c2707d426a