Remove guard and extract source.
Merge branch 'recompile-recipe'