Revert "Merge branch 'master' into plugin_botones"

This reverts commit cd4eeaa9864aa5d603be7320654c0499b1b3d335, reversing
changes made to abfdc6032551cad7e15536060fc954aebf82893b.