Reverted changes connected with dragging class fix