Riordino (reverted from commit 8e6c03c613580bff55296bdfed6618e4bef93197)