Revert "Fixed bug (inconsistency between controller & JS)"

This reverts commit 003b843946788332a92d23f7861d5a30d0970046.