Revert all fixes related to #152, #164.
Revert all fixes related to #152, #164.

This reverts commit 5e960a4976e820c0dd3c0d0cad29559dfaa09ea8.

georgjaehnig/serchilo-drupal,georgjaehnig/serchilo-drupal,georgjaehnig/serchilo-drupal