Yes that's a frustrating design... lame.
Zick, I guess you could script the removal of the computer account from AD. I have a Deployment Solution job that does this using dsquery and dsrm.
all in one line:
dsquery computer domainroot -name "%NAME%" -u adminacct -p password | dsrm -noprompt -u adminacct -p password -q
So, the DSQUERY returns the FQDN of the computer account and pipes the result to the DSRM to delete the account. You just need to make sure the DSQUERY and DSRM exe files which are part of the Windows Admin Toolkit are present.