MOB-346: Revert changes in Cite
MOB-346: Revert more stupid changes