Remove the negative margin hack which is no longer needed

This fixes issue #9965.