Backing out unnecessary memory management changes.