Revert "azzaz"

This reverts commit 7b589b47ec5255207fca4fbf2207214796342e70, reversing
changes made to 873b3228dc160902e6ad008c3816ce2fd8150624.