Revert eebd256..bc37373

This rolls back to commit eebd256ad30b5010fb22a34609f4f4bc7d6ee9e8.