Always return original value from _build_config

The (naked) return was failing the type constraint if the config hash
contained no 'engine' key. Anways return the original value in the
arround modifier (which is only used for validation).
Reflect changes
Merge branch 'bugfix/engine_validation'