This reverts merge request !24 (merged)
It caused the applications to crash in prod.
This reverts merge request !24