diff --git a/app/models/environment.rb b/app/models/environment.rb
index 7988154..72484d1 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -93,7 +93,6 @@ class Environment < ActiveRecord::Base
       'enterprise_registration' => __('Enterprise registration'),
 
       'enterprise_activation' => __('Enable activation of enterprises'),
-      'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -274,7 +273,6 @@ class Environment < ActiveRecord::Base
       organizations_are_moderated_by_default
       show_balloon_with_profile_links_when_clicked
       use_portal_community
-      wysiwyg_editor_for_environment_home
     ).each do |feature|
       enable(feature)
     end
diff --git a/app/views/admin_panel/site_info.rhtml b/app/views/admin_panel/site_info.rhtml
index ba10edf..59ebd41 100644
--- a/app/views/admin_panel/site_info.rhtml
+++ b/app/views/admin_panel/site_info.rhtml
@@ -1,8 +1,6 @@
 <h2><%= _('Site info') %></h2>
 
-<% if @environment.enabled?('wysiwyg_editor_for_environment_home') %>
-  <%= render :file => 'shared/tiny_mce' %>
-<% end %>
+<%= render :file => 'shared/tiny_mce' %>
 
 <% labelled_form_for :environment, @environment do |f| %>
 
diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb
index 290b70e..c3348b8 100644
--- a/test/functional/admin_panel_controller_test.rb
+++ b/test/functional/admin_panel_controller_test.rb
@@ -127,14 +127,7 @@ class AdminPanelControllerTest < Test::Unit::TestCase
     assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
   end
 
-  should 'not use WYSWYIG if disabled' do
-    e = Environment.default; e.disable('wysiwyg_editor_for_environment_home'); e.save!
-    get :site_info
-    assert_no_tag :tag => "script", :content => /tinyMCE\.init/
-  end
-
-  should 'use WYSWYIG if enabled' do
-    e = Environment.default; e.enable('wysiwyg_editor_for_environment_home'); e.save!
+  should 'always use WYSIWYG' do
     get :site_info
     assert_tag :tag => "script", :content => /tinyMCE\.init/
   end
--
libgit2 0.21.2