Changes accidentally left out of merge.