Reverting 180831 as it crashes TestDefaultConstructorForAPIObjects.py