Reverted made changes when trying to fix unfixable Angular problems for now