Put Dave's changes into LESS again