revert 6641ada66e477d3a6b7a3f26f35f19f85cf97f52 (wtf was I thinking?)