This reverts commit 9c191ebbce. The trimproto option is no longer needed, removing it to avoid code growth.