Revert "Merge pull request #181 from sbavanasi/Bug-1329219"

This reverts commit f8b3c4f43c7096c160dbf8d4b30801c73be0b96e, reversing
changes made to 9c9204afd054a25a8917d9829636440a6901439a.

Reverting the commit as it has broken some multiselect functionality in
policy page