Pull request: Revert "closes #1837"

WE decided to go with the solution that was implemented in the CKAN repo