Restore stuff that was merged out accidentally
Update build