BTW, this comment is not true any more; since you're moving this code block anyway, you can remove these lines.