Reverted to original :uuid option behaviour