Revert f470847..f3e0dce

This rolls back to commit f470847bdfaec7c7b1d420ac45e17abad1e9332e.
Final app