revert to deactivate-code temporary fix