Fixes previous Merge conflict
Re-adds changes from 7e0254d2f83ee4cc761a1b40d247c33e3211ffe9 that were accidentally removed