diff --git a/beets/library.py b/beets/library.py
index d040e1c18..5b5eed4e4 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -185,7 +185,6 @@ ITEM_FIELDS = [
     ('added',       DateType()),
 ]
 ITEM_KEYS          = [f[0] for f in ITEM_FIELDS]
-ITEM_KEYS_WRITABLE = set(MediaFile.fields()).intersection(ITEM_KEYS)
 
 
 # Database fields for the "albums" table.
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 024e3a3b7..15f3e9601 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -1250,7 +1250,7 @@ def write_items(lib, query, pretend):
 
         # Check for and display changes.
         changed = ui.show_model_changes(item, clean_item,
-                                        library.ITEM_KEYS_WRITABLE,
+                                        MediaFile.fields(),
                                         always=True)
         if changed and not pretend:
             try:
diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index 9306c1645..13eb6fb97 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -30,8 +30,9 @@ from beets.plugins import BeetsPlugin
 import beets.ui
 from beets import vfs
 from beets.util import bluelet
-from beets.library import ITEM_KEYS_WRITABLE
+from beets.library import ITEM_KEYS
 from beets import dbcore
+from beets.mediafile import MediaFile
 
 PROTOCOL_VERSION = '0.13.0'
 BUFSIZE = 1024
@@ -67,6 +68,7 @@ SAFE_COMMANDS = (
     u'close', u'commands', u'notcommands', u'password', u'ping',
 )
 
+ITEM_KEYS_WRITABLE = set(MediaFile.fields()).intersection(ITEM_KEYS)
 
 # Loggers.
 log = logging.getLogger('beets.bpd')