Revert "In preparation of the new OTA app."

This reverts commit 904569fc003f5601ed924c122cfafd038ac79f9a.