Revert "Does this new mention thing work?"

This reverts commit ba676c95b9262fccac4f1b7232cf856cfd18ae0d.