Reverting to logic that mirrors desktop version.