Rollback and minor fixes

#10034 slash removed