Somehow this file did not get merged from the hls branch