Revert back to stricter constraints