Try to make this work with releases prior to 2013Q3