Simplify, patch by Ramiro Polla.