Yet another ESL57 rebuild