reverted 98d794be4a309f590445c7303a3626129c79b1a3 by Jim manually and partially
Authored by: Jurgen J. Vinju 2014-12-04
Parent(s): [39c179]
Child(ren): [07339c][3543d5]