Revert mistakenly dereferenced objects