Revert ZEPPELIN-1196 from branch-0.6

[Jongyoul Lee]

I've reverted that issue because that occurs merge conflict while merging
to master.

Sorry for confusion.

-- 
이종열, Jongyoul Lee, 李宗烈
http://madeng.net