Revert "Merge pull request #88 from sexinfo/dev/mn/drupal_upgrade"

This reverts commit ba64511d3f5c8deda2542b39ee9852a285779457, reversing
changes made to a9cc6191017e7f92c94105bff4667f06e7e923e8.