Revert "DataHandler further changes"

This reverts commit 8d9db5715db4818a2992392acdfd41b8f1950b4d.