reverting some pipe optimization not working on safari