reverted schema change from admin branch