Revert "[bug #0000078]"

This reverts commit d05f69df71fa287d2074b4686bd3ef40f64ed06d.