Reverting changes back to upstream versions to avoid merge problems.