Split previous commit into two changes