Revert d74d2f7..9ce30ba

This rolls back to commit d74d2f7bd7eb9c86ff3ff2e698fafb5ccabe9cac.

As latest commit was crashing the app