Revert 0626a041c08fbc7d4aa513570ef532684c4efd8d

A proper tuple in methods is just fine.