Revert "Python 3 fix meta class declaration."

This reverts commit cb8bf748d9450e872d18f1c43a8b0d4c8b1a4333.

This commit had changes that were commited in error. I was not ready
to make these changes yet.

Change-Id: I213846d16bd7f4249dd1e722e73ec2e32d10555d