Silly me: Reverted last change. The code here is actually okay but