Revert "workaround for BZ 1164359"

This reverts commit 21a1cf707681feff2a7e966447cea5204d11bdf5.
I'm goin to use Icehouse because Juno does not work right now.
revert back to OS Icehouse