This reverts commit 5e4395544c. (http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02009.html)
5e4395544c