Hotfix for default background and no data values
Revert "Hotfix for default background and no data values"

This reverts commit 1bca66667fb20acbaa74742d0f6029788aedea54.