Remove what I'm pretty sure was a hack to work around the bug we used to have with...