This reverts commit a7c8577e7f. Reverting as we've had several complaints since this was added in. Will let @heinst reinvestigate adding this back.
a7c8577e7f