(my apologies to any future git bisect-ers) original commit: 2f891c5d39c11696846c037d531bd5d3b12f1f2b