Restore original build glue for 8.0 branch #3932