Moar hltes plsz

Change-Id: I75b07c66845de6457fec43830f4f67b388dc69ef