this needs to be reverted. see #1136 for background.