The original logic in c69650a9 was flawed. This commit removes that logic. New logic is still required for proper enforcement.