Revert "Corrected again bad merge"

This reverts commit 528997f7729b613e0b1c431004224e106414cdac.