Disabled factory for now

Change-Id: I09d71d46906216b87b09da526a33133031272f84