I removed the change in my last checkin. The fix (lines 23-27) is incorrect and not needed after the checkins by nicklassigurdh.