--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -90,23 +90,21 @@ GARBAGE += $($(1))
 libs realchrome:: $($(1))
 endef
 
 # L10NBASEDIR is not defined for en-US.
 l10n-srcdir := $(if $(filter en-US,$(AB_CD)),,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/mobile/chrome)
 
 $(eval $(call generated_file_template,suggestedsites,suggestedsites.json))
 
-skin := $(if $(MOZ_ANDROID_PHOTON),photon,australis)
-
 $(suggestedsites-dstdir-raw)/suggestedsites.json: FORCE
 	$(call py_action,generate_suggestedsites, \
 		--verbose \
 		--android-package-name=$(ANDROID_PACKAGE_NAME) \
-		--resources=$(topsrcdir)/mobile/android/app/src/$(skin)/res \
+		--resources=$(topsrcdir)/mobile/android/app/src/photon/res \
 		$(if $(filter en-US,$(AB_CD)),,--srcdir=$(l10n-srcdir)) \
 		--srcdir=$(topsrcdir)/mobile/locales/en-US/chrome \
 		$@)
 
 $(eval $(call generated_file_template,browsersearch,browsersearch.json))
 
 $(browsersearch-dstdir-raw)/browsersearch.json: FORCE
 	$(call py_action,generate_browsersearch, \

--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1002,39 +1002,29 @@ gbjar.sources += ['java/org/mozilla/geck
     'widget/themed/ThemedImageView.java',
     'widget/themed/ThemedLinearLayout.java',
     'widget/themed/ThemedListView.java',
     'widget/themed/ThemedRelativeLayout.java',
     'widget/themed/ThemedTextSwitcher.java',
     'widget/themed/ThemedTextView.java',
     'widget/themed/ThemedView.java',
 ]]
-if CONFIG['MOZ_ANDROID_PHOTON']:
-    gbjar.sources += ['../app/src/photon/java/org/mozilla/gecko/' + x for x in [
-        'home/SearchEngineRow.java',
-        'home/SuggestionItem.java',
-        'skin/SkinConfig.java',
-        'toolbar/BrowserToolbarTablet.java',
-        'toolbar/BrowserToolbarTabletBase.java',
-        'toolbar/ForwardButton.java',
-        'toolbar/TabCounter.java',
-        'toolbar/ToolbarDisplayLayout.java',
-        'toolbar/ToolbarRoundButton.java',
-    ]]
-else:
-    gbjar.sources += ['../app/src/australis/java/org/mozilla/gecko/' + x for x in [
-        'home/SearchEngineRow.java',
-        'skin/SkinConfig.java',
-        'toolbar/BrowserToolbarTablet.java',
-        'toolbar/BrowserToolbarTabletBase.java',
-        'toolbar/ForwardButton.java',
-        'toolbar/TabCounter.java',
-        'toolbar/ToolbarDisplayLayout.java',
-        'toolbar/ToolbarRoundButton.java',
-    ]]
+# The following sources are Photon specific, Eventually they should be merged into base/
+# when we are ready to drop Australis sources.
+gbjar.sources += ['../app/src/photon/java/org/mozilla/gecko/' + x for x in [
+    'home/SearchEngineRow.java',
+    'home/SuggestionItem.java',
+    'skin/SkinConfig.java',
+    'toolbar/BrowserToolbarTablet.java',
+    'toolbar/BrowserToolbarTabletBase.java',
+    'toolbar/ForwardButton.java',
+    'toolbar/TabCounter.java',
+    'toolbar/ToolbarDisplayLayout.java',
+    'toolbar/ToolbarRoundButton.java',
+]]
 
 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')
 gbjar.generated_sources = [] # Keep it this way.
 gbjar.extra_jars += [
     CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
     'constants.jar',
@@ -1388,24 +1378,19 @@ if CONFIG['MOZ_ANDROID_MMA']:
         'sync-thirdparty.jar',
     ]
 
 # Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
     '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
 ]
 
-if CONFIG['MOZ_ANDROID_PHOTON']:
-    ANDROID_RES_DIRS += [
-        '/mobile/android/app/src/photon/res',
-    ]
-else:
-    ANDROID_RES_DIRS += [
-        '/mobile/android/app/src/australis/res',
-    ]
+ANDROID_RES_DIRS += [
+    '/mobile/android/app/src/photon/res',
+]
 
 ANDROID_RES_DIRS += [
     '/mobile/android/app/src/main/res',
     '/mobile/android/services/src/main/res',
     '!res',
 ]
 
 ANDROID_GENERATED_RESFILES += [

--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -99,25 +99,16 @@ set_config('MOZ_ANDROID_MOZILLA_ONLINE',
 
 option(env='MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
        help='Build and package the install bouncer APK',
        default=True)
 
 set_config('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER',
            depends_if('MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER')(lambda _: True))
 
-option('--enable-photon', help='Enable Photon skin', default=False)
-
-@depends('--enable-photon')
-def photon_skin(value):
-    if value:
-        return True
-
-set_config('MOZ_ANDROID_PHOTON', photon_skin)
-
 imply_option('MOZ_SOCIAL', False)
 imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 imply_option('MOZ_ANDROID_HISTORY', True)
 
 set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0')
 add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0')
 
 set_config('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0')