rollback to previous version: remove HACK code