Scrap this. I read the code bad when looking at the diff. Please ignore this remark.