Reverting changes to fix build