Revert "Merge 3e0198d to OS Git repository. Fix data type in drill down."

This reverts commit b9a22f03d4b709ac347511cd9cc5680fae05d2b0.