Revert "Entropysel fixes"

This reverts commit 0bb69eb115ee257a4c1ee5177045a633040a53e6.