Revert changes that broke Builder

This changes must be abpied later on...

re #6175