Addressing issue #1593, removing calls to rebuild class