Reverting #2829 due to numerous complaints