Fix release build rules following 23c9f97 and #659