This reverts commit c6ee7553. We have gotten feedback that this experiment was not liked by users, so reverting.