reverts a3db9c100dc8885662acc092d58d0b921e71780c

@Dylnuge @cyril-sf 

Commit breaks select behavior, so I'm reverting.

@addepar-andy -- Please fix and re-commit