No bug - Bandaid to make registration work right; real fix coming in bug 1017394, rs=Standard8