Revert "This might break the app."

This reverts commit df4aef1a3954b10e3443427534283189eabf5a51.
Revert "."

This reverts commit e189f5d93f3f48932af636cc8d6d7e78f8eae2c5.