Fixes Bug #3056
Revert "Fixes Bug #3056"

This reverts commit ace3b139742de6e45556cea4abf8a49d9ec0fe5d.
Fixes #2357
Merge commit