Apply changes from dcolascione.