backing out some bad code