Reverted fix for #1651, which introduced an error with stack data labels not being moved on update. Closes #2336.