Modified to revert trim call