MYB-813 Fix errant merge artifact
MYB-813 Fix errant merge artifact

rhollow/MYB-1615,ets-berkeley-edu/3akai-ux,jonmhays/3akai-ux,ets-berkeley-edu/3akai-ux,jonmhays/3akai-ux,ets-berkeley-edu/3akai-ux,jonmhays/3akai-ux,rhollow/MYB-1615,rhollow/MYB-1615