Revert 6f345df..bfb18ed

This rolls back to commit 6f345dfe77d1b7f85fe458966a2d97072b93b7c5.
Temporary fix for uniform scaling

[ToDo]
 - fix data watch structure