Reverting my previous change - we are doing weird things with JS :(