Pull request for Issue #117

After a merge the concerned feature in the commit needs to be reverted.

references code4aap/drupal-aap-campaign#117