reverting changes to master to not break admin build until testing complete