Reverting coffee-script change. Will propose that one in separate branch.