Incorporated changes that were dropped in Lorenzo's integration.