Revert "Builder: Remove var-replacing-return in built files"

This reverts commit a73a61154a73431599e20ff847be2506c9456439.

Revert #204