Revert back to Robert's changes.