This reverts commit f6439789db. Oops, I committed unrelated changes here, let me clean that up..
f6439789db