Adding back changes made to release version.