Reverting BATCH-2066 to fix build