Revert changes to match sample app